Skip to content

[3.0.x] Pin hibernate (backport #905) by @mkurz #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
mkurz merged 1 commit into from
Jul 8, 2025
Merged

[3.0.x] Pin hibernate (backport #905) by @mkurz #906

mkurz merged 1 commit into from
Jul 8, 2025

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2025

Not java 11 compatible.
Also Hibernate 7 maybe needs some special handling, not sure yet:

@mergify
Copy link
Contributor Author

mergify bot commented Jul 8, 2025

Cherry-pick of a8bef24 has failed:

On branch mergify/bp/3.0.x/pr-905
Your branch is up to date with 'origin/3.0.x'.

You are currently cherry-picking commit a8bef245.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/scala-steward.conf

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jul 8, 2025
@mergify mergify bot mentioned this pull request Jul 8, 2025
Merged
@mkurz mkurz changed the title [3.0.x] [2.9.x] Pin hibernate (backport #905) by @mkurz [3.0.x] Pin hibernate (backport #905) by @mkurz Jul 8, 2025
@mkurz
Pin hibernate
25984e8 
(cherry picked from commit a8bef24)

# Conflicts:
#	.github/scala-steward.conf
@mkurz mkurz force-pushed the mergify/bp/3.0.x/pr-905 branch from 6a5f9c2 to 25984e8 Compare July 8, 2025 08:38
@mkurz mkurz merged commit 1485a20 into 3.0.x Jul 8, 2025
1 of 2 checks passed
@mkurz mkurz deleted the mergify/bp/3.0.x/pr-905 branch July 8, 2025 08:39
This was referenced Jul 8, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mkurz